]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
ci: Stop building malcontent
authorFlorian Müllner <fmuellner@gnome.org>
Mon, 23 Mar 2026 22:26:35 +0000 (23:26 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Mon, 23 Mar 2026 22:26:35 +0000 (23:26 +0100)
After updating the image to F44, the malcontent version is
already recent enough for parental controls support.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4151>

.gitlab-ci/build-toolbox-image.sh

index 6983028e185219f53dc0f940f8bac5e3474edabf..09cbbfe2834123cd4edf75ad8f5d8eefa1efbaf9 100755 (executable)
@@ -41,7 +41,6 @@ build_container() {
   )
   buildah run $build_cntr dnf config-manager setopt '*-openh264.enabled=0'
   buildah run $build_cntr dnf install -y "${extra_packages[@]}"
-  buildah run $build_cntr dnf builddep malcontent -y # for building libmalcontent
   buildah run $build_cntr dnf debuginfo-install -y "${debug_packages[@]}"
   buildah run $build_cntr dnf clean all
   buildah run $build_cntr rm -rf /var/lib/cache/dnf
@@ -59,11 +58,6 @@ build_container() {
   local srcdir=$(realpath $(dirname $0))
   buildah copy --chmod 755 $build_cntr $srcdir/install-meson-project.sh /usr/libexec
 
-  # add latest malcontent to the toolbox image for testing future integration
-  buildah run $build_cntr /usr/libexec/install-meson-project.sh https://gitlab.freedesktop.org/pwithnall/malcontent.git main -Dlibgsystemservice:gtk_doc=false
-  # somehow installing with buildah breaks the execute bit in malcontent-client
-  buildah run $build_cntr chmod 755 /usr/bin/malcontent-client
-
   # include convenience script for updating mutter dependency
   local update_mutter=$(mktemp)
   cat > $update_mutter <<-EOF